Skip to content

Conversation

@hopehadfield
Copy link
Contributor

@hopehadfield hopehadfield commented Nov 7, 2025

IMPORTANT: Do Not Merge - To be merged by Docs Team Only

Version(s): main, 1.8

Fixes an issue whereref-rh-supported-plugins.adoc and ref-rh-tech-preview-plugins.adoc were not being sorted by plugin name. cc @Gerry-Forde

@rhdh-bot
Copy link
Collaborator

rhdh-bot commented Nov 7, 2025

Copy link
Member

@nickboldt nickboldt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Nov 7, 2025
@nickboldt nickboldt added Technical review done ⛅ Any procedure has been succesfully tested Ready to merge 💂 labels Nov 7, 2025
@nickboldt
Copy link
Member

/cherry-pick release-1.8

@openshift-cherrypick-robot
Copy link
Contributor

@nickboldt: once the present PR merges, I will cherry-pick it on top of release-1.8 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@Gerry-Forde Gerry-Forde merged commit 4a0a570 into redhat-developer:main Nov 7, 2025
3 checks passed
@openshift-cherrypick-robot
Copy link
Contributor

@nickboldt: #1535 failed to apply on top of branch "release-1.8":

Applying: chore: fix sorting and regen supported plugin tables
.git/rebase-apply/patch:16: trailing whitespace.
|Adoption Insights |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-adoption-insights/v/0.2.1[@red-hat-developer-hub/backstage-plugin-adoption-insights]` |0.2.1 
.git/rebase-apply/patch:20: trailing whitespace.
|Adoption Insights |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-adoption-insights-backend/v/0.2.1[@red-hat-developer-hub/backstage-plugin-adoption-insights-backend]` |0.2.1 
.git/rebase-apply/patch:24: trailing whitespace.
|Analytics Module Adoption Insights |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights/v/0.2.0[@red-hat-developer-hub/backstage-plugin-analytics-module-adoption-insights]` |0.2.0 
.git/rebase-apply/patch:37: trailing whitespace.
|Argo CD |`https://npmjs.com/package/@roadiehq/backstage-plugin-argo-cd-backend/v/4.4.2[@roadiehq/backstage-plugin-argo-cd-backend]` |4.4.2 
.git/rebase-apply/patch:60: trailing whitespace.
|Dynamic Home Page |`https://npmjs.com/package/@red-hat-developer-hub/backstage-plugin-dynamic-home-page/v/1.9.2[@red-hat-developer-hub/backstage-plugin-dynamic-home-page]` |1.9.2 
warning: squelched 69 whitespace errors
warning: 74 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	modules/dynamic-plugins/ref-rh-supported-plugins.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/dynamic-plugins/ref-rh-supported-plugins.adoc
CONFLICT (content): Merge conflict in modules/dynamic-plugins/ref-rh-supported-plugins.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 chore: fix sorting and regen supported plugin tables

In response to this:

/cherry-pick release-1.8

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lgtm Ready to merge 💂 Technical review done ⛅ Any procedure has been succesfully tested

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants